Fix segfault when widget->parent is NULL. (#75615, Alexey A. Malyshev)

Wed Mar 20 12:06:30 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkwidget.c (gtk_widget_set_child_visible):
        Fix segfault when widget->parent is NULL.
        (#75615, Alexey A. Malyshev)

diff --git a/ChangeLog b/ChangeLog
index 6213322040d088e3150e345aad91084622541042..d3dbb388030c1aca5114de3d6ccb465bcc454afb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Mar 20 12:06:30 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_set_child_visible):
+       Fix segfault when widget->parent is NULL. 
+       (#75615, Alexey A. Malyshev) 
+
 Wed Mar 20 11:32:07 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c: Improve test to prevent infinite

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6213322040d088e3150e345aad91084622541042..d3dbb388030c1aca5114de3d6ccb465bcc454afb 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Wed Mar 20 12:06:30 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_set_child_visible):
+       Fix segfault when widget->parent is NULL. 
+       (#75615, Alexey A. Malyshev) 
+
 Wed Mar 20 11:32:07 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c: Improve test to prevent infinite

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 6213322040d088e3150e345aad91084622541042..d3dbb388030c1aca5114de3d6ccb465bcc454afb 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Wed Mar 20 12:06:30 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_set_child_visible):
+       Fix segfault when widget->parent is NULL. 
+       (#75615, Alexey A. Malyshev) 
+
 Wed Mar 20 11:32:07 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c: Improve test to prevent infinite

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 6213322040d088e3150e345aad91084622541042..d3dbb388030c1aca5114de3d6ccb465bcc454afb 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Wed Mar 20 12:06:30 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_set_child_visible):
+       Fix segfault when widget->parent is NULL. 
+       (#75615, Alexey A. Malyshev) 
+
 Wed Mar 20 11:32:07 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c: Improve test to prevent infinite

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6213322040d088e3150e345aad91084622541042..d3dbb388030c1aca5114de3d6ccb465bcc454afb 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Wed Mar 20 12:06:30 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_set_child_visible):
+       Fix segfault when widget->parent is NULL. 
+       (#75615, Alexey A. Malyshev) 
+
 Wed Mar 20 11:32:07 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c: Improve test to prevent infinite

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6213322040d088e3150e345aad91084622541042..d3dbb388030c1aca5114de3d6ccb465bcc454afb 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Wed Mar 20 12:06:30 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_set_child_visible):
+       Fix segfault when widget->parent is NULL. 
+       (#75615, Alexey A. Malyshev) 
+
 Wed Mar 20 11:32:07 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c: Improve test to prevent infinite

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 550f5ebda3119a0e54d69a6dd630a1387c5324a3..9f73dd0c00b3ed8d13b2734dac3a5b5db1c29d34 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -4526,7 +4526,7 @@ gtk_widget_set_child_visible (GtkWidget *widget,
     GTK_PRIVATE_SET_FLAG (widget, GTK_CHILD_VISIBLE);
   else
     GTK_PRIVATE_UNSET_FLAG (widget, GTK_CHILD_VISIBLE);
-  if (GTK_WIDGET_REALIZED (widget->parent))
+  if (widget->parent && GTK_WIDGET_REALIZED (widget->parent))
     {
       if (GTK_WIDGET_MAPPED (widget->parent) &&
          GTK_WIDGET_CHILD_VISIBLE (widget) &&